Skip to content

[java] Removing old stream collectors required by Java 8#15523

Merged
diemol merged 3 commits intoSeleniumHQ:trunkfrom
zodac-personal:removing_java_8_collectors
Jul 5, 2025
Merged

[java] Removing old stream collectors required by Java 8#15523
diemol merged 3 commits intoSeleniumHQ:trunkfrom
zodac-personal:removing_java_8_collectors

Conversation

@zodac-personal
Copy link
Contributor

@zodac-personal zodac-personal commented Mar 27, 2025 •
edited by qodo-code-review bot
Loading

User description

Motivation and Context

There was some left-over Collector logic that was required in Java 8 to create an unmodifiable Map/Set. Since the minimum Java version has been upgraded to Java 11, we can replace these calls with Collectors#toUnmodifiableMap() and Collectors#toUnmodifiableSet() in the standard library (available since Java 10).

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Refactoring (no changes to public API)

Checklist

  • I have read the contributing document.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed. (tested with bazel test //java/... --test_size_filters=small)

PR Type

Enhancement

Description

  • Replaced custom collectors with standard Java 10 collectors.

  • Removed redundant methods for unmodifiable collections.

  • Simplified stream operations using Collectors.toUnmodifiableMap and Collectors.toUnmodifiableSet.

Changes walkthrough 📝

Relevant files
Enhancement
PersistentCapabilities.java
Refactored to use Java 10 collectors for unmodifiable collections

java/src/org/openqa/selenium/PersistentCapabilities.java

  • Replaced toUnmodifiableMap with Collectors.toUnmodifiableMap.
  • Replaced toUnmodifiableSet with Collectors.toUnmodifiableSet.
  • Removed custom collector methods for unmodifiable collections.
  • Simplified stream operations for map and set creation.
    		• +2/-16   
    Need help?
  • Type /help how to ... in the comments thread for any questions about Qodo Merge usage.
  • Check out the documentation for more information.
    •

    @qodo-code-review
    Copy link
    Contributor

    qodo-code-review bot commented Mar 27, 2025

    PR Reviewer Guide 🔍

    Here are some key observations to aid the review process:

    ⏱️ Estimated effort to review: 1 🔵⚪⚪⚪⚪
    🧪 No relevant tests
    🔒 No security concerns identified
    ⚡ No major issues detected

    @qodo-code-review
    Copy link
    Contributor

    qodo-code-review bot commented Mar 27, 2025 •
    edited
    Loading

    PR Code Suggestions ✨

    Explore these optional code suggestions:

    CategorySuggestion                                                                                                                                    Impact
    Possible issue
    Java version compatibility issue

    Add a check for Java version compatibility. The Collectors.toUnmodifiableMap and
    Collectors.toUnmodifiableSet methods were introduced in Java 10, but the comment
    removed from the code suggests the project targets Java 8 as minimum version.

    java/src/org/openqa/selenium/PersistentCapabilities.java [20-25]

     import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.openqa.selenium.internal.Require;
 
+// Ensure your runtime environment is Java 10+ as Collectors.toUnmodifiableMap
+// and Collectors.toUnmodifiableSet were introduced in Java 10
+
    • Apply this suggestion
    Suggestion importance[1-10]: 9

    __

    Why: This suggestion identifies a critical compatibility issue. The PR replaces custom collectors with Java 10 methods while the removed code comments explicitly stated the project targets Java 8 as minimum version. This change could break the application for users on Java 8-9 environments.

    		High
    • Update

    diemol
    diemol approved these changes Jul 5, 2025
    View reviewed changes
    Copy link
    Member

    @diemol diemol left a comment

    Choose a reason for hiding this comment

    The reason will be displayed to describe this comment to others. Learn more.

    Thank you, @zodac

    @diemol diemol merged commit a23bc9f into SeleniumHQ:trunk Jul 5, 2025
    33 of 34 checks passed
    This was referenced Sep 12, 2025
    Closed
    Closed
    Merged
    This was referenced Sep 19, 2025
    Closed
    Closed
    Closed
    This was referenced Oct 1, 2025
    Closed
    Closed
    Closed
    Merged
    Closed
    Closed
    Closed
    This was referenced Oct 20, 2025
    Closed
    Closed
    Closed
    Closed
    This was referenced Dec 15, 2025
    Closed
    Open
    Closed
    Closed
    Closed
    @dependabot dependabot bot mentioned this pull request Dec 22, 2025
    Closed
    This was referenced Jan 19, 2026
    Open
    Open
    Open
    Open
    Open
    Merged
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

    Reviewers

    @diemol diemol diemol approved these changes

    Assignees

    No one assigned

    Labels

    Review effort 1/5

    Projects

    None yet

    Milestone

    No milestone

    Development

    Successfully merging this pull request may close these issues.

    2 participants

    @zodac-personal @diemol